[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/files/, mail-filter/procmail/
commit: 7a66af10677517dfca3ddfe3d3599b2e53ba45f9
Author: Yixun Lan gentoo org>
AuthorDate: Sun Feb 25 09:12:35 2024 +
Commit: Yixun Lan gentoo org>
CommitDate: Sun Feb 25 09:27:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a66af10
mail-filter/procmail: drop 3.22-r15, 3.22-r16
cleanup old EAPI=6 after stabilization
Signed-off-by: Yixun Lan gentoo.org>
mail-filter/procmail/Manifest | 1 -
mail-filter/procmail/files/gentoo-maildir3.diff| 12 --
.../files/procmail-3.22-CVE-2014-3618.patch| 18 ---
.../files/procmail-3.22-CVE-2017-16844.patch | 13 --
.../procmail/files/procmail-3.22-crash-fix.patch | 58
.../procmail/files/procmail-3.22-glibc-2.10.patch | 70 --
.../procmail/files/procmail-comsat-segfault.diff | 20 ---
.../procmail/files/procmail-lazy-bindings.diff | 16 ---
.../procmail/files/procmail-maxprocs-fix.diff | 11 --
mail-filter/procmail/files/procmail-pipealloc.diff | 21 ---
mail-filter/procmail/files/procmail-prefix.patch | 155 -
mail-filter/procmail/procmail-3.22-r15.ebuild | 125 -
mail-filter/procmail/procmail-3.22-r16.ebuild | 135 --
13 files changed, 655 deletions(-)
diff --git a/mail-filter/procmail/Manifest b/mail-filter/procmail/Manifest
index e05644b06225..24540afb4bdf 100644
--- a/mail-filter/procmail/Manifest
+++ b/mail-filter/procmail/Manifest
@@ -1,2 +1 @@
-DIST procmail-3.22.tar.gz 226817 BLAKE2B
4fd4641abcd3a897ea19bd8f76446f88806d22649d5221f8cef6f9efc29f7fcc02c9707cbf00c32fe247f16579d28fd887d3c18c4d3a2f8877c351bf92e85866
SHA512
3d0658329a55957a8d5741e03b0853b030c4524acef30641663213aa9eefc8264f8cc2b68a00a89e5f9f0f7c916c41a42e1b6c8df562c545ba97d8ab9049a936
DIST procmail-3.24.gh.tar.gz 299704 BLAKE2B
3223e9551a48329da88545bc8b90a346dea1182ba5ec6221acbe7a76cf01485b7115194087104bd042eeec3660de9f6146c5b9d984763fee1e2174f1edd59c11
SHA512
ce3763205d7e34c8a096c411487de296ecfb190ba817ad07926d44811222e689faedb97a3d4e85989db70e5a2298b26fff70c9d0cb0324a447ddc8988d7fe8ea
diff --git a/mail-filter/procmail/files/gentoo-maildir3.diff
b/mail-filter/procmail/files/gentoo-maildir3.diff
deleted file mode 100644
index 51dfef64ae8b..
--- a/mail-filter/procmail/files/gentoo-maildir3.diff
+++ /dev/null
@@ -1,12 +0,0 @@
procmail-3.22/src/authenticate.c.orig 2002-07-26 20:38:52.0
-0400
-+++ procmail-3.22/src/authenticate.c 2002-07-26 20:57:56.0 -0400
-@@ -39,7 +39,7 @@
- #include "authenticate.h"
-
- #ifndef MAILSPOOLDIR
--#define MAILSPOOLDIR "/var/spool/mail/" /* watch the trailing / */
-+#define MAILSPOOLDIR "" /* watch the trailing / */
- #endif
- #ifndef MAILSPOOLSUFFIX
- #define MAILSPOOLSUFFIX "" /* suffix to force maildir or MH style */
-
diff --git a/mail-filter/procmail/files/procmail-3.22-CVE-2014-3618.patch
b/mail-filter/procmail/files/procmail-3.22-CVE-2014-3618.patch
deleted file mode 100644
index 124d1f996852..
--- a/mail-filter/procmail/files/procmail-3.22-CVE-2014-3618.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/formisc.c b/src/formisc.c
-index 338733b..c48df52 100644
a/src/formisc.c
-+++ b/src/formisc.c
-@@ -84,12 +84,11 @@ normal: *target++= *start++;
- case '"':*target++=delim='"';start++;
- }
- ;{ int i;
-- do
-+ while(*start) /* anything? */
- if((i= *target++= *start++)==delim) /* corresponding delimiter? */
- break;
- else if(i=='\\'&&*start) /* skip quoted character */
- *target++= *start++;
-- while(*start); /* anything? */
- }
- hitspc=2;
-}
diff --git a/mail-filter/procmail/files/procmail-3.22-CVE-2017-16844.patch
b/mail-filter/procmail/files/procmail-3.22-CVE-2017-16844.patch
deleted file mode 100644
index 5e610d723da0..
--- a/mail-filter/procmail/files/procmail-3.22-CVE-2017-16844.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/formisc.c b/src/formisc.c
-index 5c2869d..54fd013 100644
a/src/formisc.c
-+++ b/src/formisc.c
-@@ -103,7 +103,7 @@ void loadsaved(sp)const struct saved*const sp; /*
load some saved text */
- }
- /* append to buf */
- void loadbuf(text,len)const char*const text;const size_t len;
--{ if(buffilled+len>buflen) /* buf can't hold the text */
-+{ while(buffilled+len>buflen) /* buf can't hold the text */
- buf=realloc(buf,buflen+=Bsize);
- tmemmove(buf+buffilled,text,len);buffilled+=len;
- }
diff --git a/mail-filter/procmail/files/procmail-3.22-crash-fix.patch
b/mail-filter/procmail/files/procmail-3.22-crash-fix.patch
deleted file mode 100644
index 8563ea3d1d4c..
---
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: d1f89e91f3fefc66dc9930bccd12b3d39728f2de
Author: Sam James gentoo org>
AuthorDate: Mon Jan 22 13:11:51 2024 +
Commit: Sam James gentoo org>
CommitDate: Mon Jan 22 13:11:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1f89e91
mail-filter/procmail: Stabilize 3.24 hppa, #922035
Signed-off-by: Sam James gentoo.org>
mail-filter/procmail/procmail-3.24.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/procmail/procmail-3.24.ebuild
b/mail-filter/procmail/procmail-3.24.ebuild
index 888a85c8dfc3..803fcdb40c4e 100644
--- a/mail-filter/procmail/procmail-3.24.ebuild
+++ b/mail-filter/procmail/procmail-3.24.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/BuGlessRB/procmail/archive/refs/tags/v${PV}.tar.gz -
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="mbox selinux"
DEPEND="
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: f43c319f324fa26f4623a4e5a5ad8ebde0b7015b
Author: Sam James gentoo org>
AuthorDate: Sat Jan 13 17:39:24 2024 +
Commit: Sam James gentoo org>
CommitDate: Sat Jan 13 17:39:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f43c319f
mail-filter/procmail: Stabilize 3.24 x86, #922035
Signed-off-by: Sam James gentoo.org>
mail-filter/procmail/procmail-3.24.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/procmail/procmail-3.24.ebuild
b/mail-filter/procmail/procmail-3.24.ebuild
index 3cfb100a83db..888a85c8dfc3 100644
--- a/mail-filter/procmail/procmail-3.24.ebuild
+++ b/mail-filter/procmail/procmail-3.24.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/BuGlessRB/procmail/archive/refs/tags/v${PV}.tar.gz -
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390
sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="mbox selinux"
DEPEND="
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: 056107f94d2d8c488dcaf12988ca7a7396433042
Author: Sam James gentoo org>
AuthorDate: Sat Jan 13 14:30:42 2024 +
Commit: Sam James gentoo org>
CommitDate: Sat Jan 13 14:30:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=056107f9
mail-filter/procmail: Stabilize 3.24 amd64, #922035
Signed-off-by: Sam James gentoo.org>
mail-filter/procmail/procmail-3.24.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/procmail/procmail-3.24.ebuild
b/mail-filter/procmail/procmail-3.24.ebuild
index 59c1d751ac6c..3cfb100a83db 100644
--- a/mail-filter/procmail/procmail-3.24.ebuild
+++ b/mail-filter/procmail/procmail-3.24.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/BuGlessRB/procmail/archive/refs/tags/v${PV}.tar.gz -
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390
sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390
sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="mbox selinux"
DEPEND="
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: b7b113af733352a34a67296ac8db590df48f4bf6
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Jan 13 12:48:49 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Jan 13 12:48:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7b113af
mail-filter/procmail: Stabilize 3.24 sparc, #922035
Signed-off-by: Arthur Zamarin gentoo.org>
mail-filter/procmail/procmail-3.24.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/procmail/procmail-3.24.ebuild
b/mail-filter/procmail/procmail-3.24.ebuild
index d2115eb7c30b..59c1d751ac6c 100644
--- a/mail-filter/procmail/procmail-3.24.ebuild
+++ b/mail-filter/procmail/procmail-3.24.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/BuGlessRB/procmail/archive/refs/tags/v${PV}.tar.gz -
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390
sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="mbox selinux"
DEPEND="
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: 138e8638184ebe74a88b832df8c4998607e21f7b
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Jan 13 12:48:48 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Jan 13 12:48:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=138e8638
mail-filter/procmail: Stabilize 3.24 ppc64, #922035
Signed-off-by: Arthur Zamarin gentoo.org>
mail-filter/procmail/procmail-3.24.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-filter/procmail/procmail-3.24.ebuild
b/mail-filter/procmail/procmail-3.24.ebuild
index fda6f283d5a6..29fc4799b27e 100644
--- a/mail-filter/procmail/procmail-3.24.ebuild
+++ b/mail-filter/procmail/procmail-3.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/BuGlessRB/procmail/archive/refs/tags/v${PV}.tar.gz -
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="mbox selinux"
DEPEND="
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: 4b0ce8c58e07036c241b755e3a6bdc01195c0eef
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Jan 13 12:48:49 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Jan 13 12:48:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b0ce8c5
mail-filter/procmail: Stabilize 3.24 arm, #922035
Signed-off-by: Arthur Zamarin gentoo.org>
mail-filter/procmail/procmail-3.24.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/procmail/procmail-3.24.ebuild
b/mail-filter/procmail/procmail-3.24.ebuild
index 29fc4799b27e..d2115eb7c30b 100644
--- a/mail-filter/procmail/procmail-3.24.ebuild
+++ b/mail-filter/procmail/procmail-3.24.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/BuGlessRB/procmail/archive/refs/tags/v${PV}.tar.gz -
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="mbox selinux"
DEPEND="
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/, mail-filter/procmail/files/
commit: 4649dc4cd4f8e21a79a48ced996cd5b747e31754 Author: Yixun Lan gentoo org> AuthorDate: Tue Oct 10 13:22:42 2023 + Commit: Yixun Lan gentoo org> CommitDate: Mon Dec 4 02:27:07 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4649dc4c mail-filter/procmail: add 3.24 version bump to new release which collect lots fixes Closes: https://github.com/gentoo/gentoo/pull/33280 Signed-off-by: Yixun Lan gentoo.org> mail-filter/procmail/Manifest | 1 + .../files/procmail-3.24-gentoo-prefix.patch| 168 + .../files/procmail-3.24-lazy-bindings.patch| 18 +++ .../procmail/files/procmail-3.24-maildir.patch | 16 ++ mail-filter/procmail/procmail-3.24.ebuild | 117 ++ 5 files changed, 320 insertions(+) diff --git a/mail-filter/procmail/Manifest b/mail-filter/procmail/Manifest index bf817c923214..e05644b06225 100644 --- a/mail-filter/procmail/Manifest +++ b/mail-filter/procmail/Manifest @@ -1 +1,2 @@ DIST procmail-3.22.tar.gz 226817 BLAKE2B 4fd4641abcd3a897ea19bd8f76446f88806d22649d5221f8cef6f9efc29f7fcc02c9707cbf00c32fe247f16579d28fd887d3c18c4d3a2f8877c351bf92e85866 SHA512 3d0658329a55957a8d5741e03b0853b030c4524acef30641663213aa9eefc8264f8cc2b68a00a89e5f9f0f7c916c41a42e1b6c8df562c545ba97d8ab9049a936 +DIST procmail-3.24.gh.tar.gz 299704 BLAKE2B 3223e9551a48329da88545bc8b90a346dea1182ba5ec6221acbe7a76cf01485b7115194087104bd042eeec3660de9f6146c5b9d984763fee1e2174f1edd59c11 SHA512 ce3763205d7e34c8a096c411487de296ecfb190ba817ad07926d44811222e689faedb97a3d4e85989db70e5a2298b26fff70c9d0cb0324a447ddc8988d7fe8ea diff --git a/mail-filter/procmail/files/procmail-3.24-gentoo-prefix.patch b/mail-filter/procmail/files/procmail-3.24-gentoo-prefix.patch new file mode 100644 index ..8426a53d8f59 --- /dev/null +++ b/mail-filter/procmail/files/procmail-3.24-gentoo-prefix.patch @@ -0,0 +1,168 @@ +diff --git a/Makefile b/Makefile +index 0be77b1..42bb241 100644 +--- a/Makefile b/Makefile +@@ -2,7 +2,7 @@ + + # BASENAME should point to where the whole lot will be installed + # change BASENAME to your home directory if need be +-BASENAME = /usr ++BASENAME = @GENTOO_PORTAGE_EPREFIX@/usr + # For display in the man pages + VISIBLE_BASENAME= $(BASENAME) + +@@ -79,7 +79,7 @@ SEARCHLIBS = -lm -ldir -lx -lsocket -lnet -linet -lnsl_s -lnsl_i -lnsl -lsun \ + # -lresolv# not really needed, is it? + + # Informal list of directories where we look for the libraries in SEARCHLIBS +-LIBPATHS=/lib /usr/lib /usr/local/lib ++LIBPATHS=@GENTOO_PORTAGE_EPREFIX@/lib @GENTOO_PORTAGE_EPREFIX@/usr/lib + + GCC_WARNINGS = -O2 -pedantic -Wreturn-type -Wunused -Wformat -Wtraditional \ + -Wpointer-arith -Wconversion -Waggregate-return \ +@@ -97,10 +97,10 @@ LDFLAGS1= $(LDFLAGS0) $(LIBS) #-lcposix + CC= cc # gcc + # object file extension + O = o +-RM= /bin/rm -f ++RM= @GENTOO_PORTAGE_EPREFIX@/bin/rm -f + MV= mv -f + LN= ln +-BSHELL= /bin/sh ++BSHELL= @GENTOO_PORTAGE_EPREFIX@/bin/sh + INSTALL = cp + DEVNULL = /dev/null + STRIP = strip +@@ -112,7 +112,7 @@ MANS1S = procmail formail lockfile mailstat + MANS5S= procmailrc procmailsc procmailex + + # Possible locations for the sendmail.cf file +-SENDMAILCFS = /etc/mail/sendmail.cf /etc/sendmail.cf /usr/lib/sendmail.cf ++SENDMAILCFS = @GENTOO_PORTAGE_EPREFIX@/etc/mail/sendmail.cf @GENTOO_PORTAGE_EPREFIX@/etc/sendmail.cf @GENTOO_PORTAGE_EPREFIX@/usr/lib/sendmail.cf + + # Makefile - mark, don't (re)move this, a sed script needs it + +diff --git a/config.h b/config.h +index 4f6b57e..ef69e0b 100644 +--- a/config.h b/config.h +@@ -116,11 +116,11 @@ + is not found, maildelivery will proceed as normal to the default + system mailbox. This also must be an absolute path */ + +-#define ETCRC "/etc/procmailrc" /* optional global procmailrc startup ++#define ETCRC "@GENTOO_PORTAGE_EPREFIX@/etc/procmailrc" /* optional global procmailrc startup + file (will only be read if procmail + is started with no rcfile on the command line). */ + +-#define ETCRCS"/etc/procmailrcs/" /* optional trusted path prefix for ++#define ETCRCS"@GENTOO_PORTAGE_EPREFIX@/etc/procmailrcs/" /* optional trusted path prefix for + rcfiles which will be executed with + the uid of the owner of the rcfile (this only happens if procmail is + called with the -m option, without variable assignments on the command +@@ -175,7 +175,7 @@ + #define INEFFICIENTrealloc /* don't pussy-foot around */ + #endif + #define MAXinMEM (1024*1024) /* when to switch to mmap() */ +-#define MMAP_DIR "/var/spool/procmail/" /* where to put */ ++#define MMAP_DIR "@GENTOO_PORTAGE_EPREFIX@/var/spool/procmail/"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: e92325dddea86232ac9577049695a9f11522a58c
Author: Sam James gentoo org>
AuthorDate: Sat Dec 2 06:05:44 2023 +
Commit: Sam James gentoo org>
CommitDate: Sat Dec 2 07:10:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e92325dd
mail-filter/procmail: update EAPI 6 -> 8, gnu89, no LTO
* Filter LTO (bug #859517, bug #874375 - the latter is a somewhat real bug but
it only happens with races and not worth fixing for procmail anyway given
the first bug & it's dead)
* Set -std=gnu89 (bug #875251, bug #896052) for modern C compilers.
Closes: https://bugs.gentoo.org/859517
Closes: https://bugs.gentoo.org/875251
Closes: https://bugs.gentoo.org/896052
Closes: https://bugs.gentoo.org/874375
Signed-off-by: Sam James gentoo.org>
mail-filter/procmail/procmail-3.22-r16.ebuild | 135 ++
1 file changed, 135 insertions(+)
diff --git a/mail-filter/procmail/procmail-3.22-r16.ebuild
b/mail-filter/procmail/procmail-3.22-r16.ebuild
new file mode 100644
index ..b53f7b58ddfe
--- /dev/null
+++ b/mail-filter/procmail/procmail-3.22-r16.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs prefix
+
+DESCRIPTION="Mail delivery agent/filter"
+HOMEPAGE="http://www.procmail.org/;
+SRC_URI="http://www.procmail.org/${P}.tar.gz;
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="mbox selinux"
+
+DEPEND="
+ acct-group/mail
+ virtual/mta
+"
+RDEPEND="
+ ${DEPEND}
+ selinux? ( sec-policy/selinux-procmail )
+"
+
+src_prepare() {
+ # disable flock, using both fcntl and flock style locking
+ # doesn't work with NFS with 2.6.17+ kernels, bug #156493
+
+ sed -e "s|/\*#define NO_flock_LOCK|#define NO_flock_LOCK|" \
+ -i config.h || die "sed failed"
+
+ if ! use mbox ; then
+ echo "# Use maildir-style mailbox in user's home directory" >
"${S}"/procmailrc || die
+ echo 'DEFAULT=$HOME/.maildir/' >> "${S}"/procmailrc || die
+ cd "${S}" || die
+ eapply "${FILESDIR}/gentoo-maildir3.diff"
+ else
+ echo '# Use mbox-style mailbox in /var/spool/mail' >
"${S}"/procmailrc || die
+ echo 'DEFAULT=${EPREFIX}/var/spool/mail/$LOGNAME' >>
"${S}"/procmailrc || die
+ fi
+
+ # Do not use lazy bindings on lockfile and procmail
+ if [[ ${CHOST} != *-darwin* ]]; then
+ eapply -p0 "${FILESDIR}/${PN}-lazy-bindings.diff"
+ fi
+
+ # Fix for bug #102340
+ eapply -p0 "${FILESDIR}/${PN}-comsat-segfault.diff"
+
+ # Fix for bug #119890
+ eapply -p0 "${FILESDIR}/${PN}-maxprocs-fix.diff"
+
+ # Prefixify config.h
+ eapply -p0 "${FILESDIR}"/${PN}-prefix.patch
+ eprefixify config.h Makefile src/autoconf src/recommend.c
+
+ # Fix for bug #26
+ eapply "${FILESDIR}/${PN}-pipealloc.diff"
+
+ # Fix for bug #270551
+ eapply "${FILESDIR}/${PN}-3.22-glibc-2.10.patch"
+
+ # Fix security bugs #522114 and #638108
+ eapply "${FILESDIR}/${PN}-3.22-CVE-2014-3618.patch"
+ eapply "${FILESDIR}/${PN}-3.22-CVE-2017-16844.patch"
+
+ eapply "${FILESDIR}/${PN}-3.22-crash-fix.patch"
+
+ eapply_user
+}
+
+src_compile() {
+ # bug #875251, bug #896052
+ append-flags -std=gnu89
+ # bug #859517
+ filter-lto
+
+ # -finline-functions (implied by -O3) leaves strstr() in an infinite
loop.
+ # To work around this, we append -fno-inline-functions to CFLAGS
+ # Since GCC 4.7 we also need -fno-ipa-cp-clone (bug #466552)
+ # If it's clang, ignore -fno-ipa-cp-clone, as clang doesn't support this
+ append-flags -fno-inline-functions
+ tc-is-clang || append-flags -fno-ipa-cp-clone
+
+ sed -e "s|CFLAGS0 = -O|CFLAGS0 = ${CFLAGS}|" \
+ -e "s|LDFLAGS0= -s|LDFLAGS0 = ${LDFLAGS}|" \
+ -e "s|LOCKINGTEST=__defaults__|#LOCKINGTEST=__defaults__|" \
+ -e "s|#LOCKINGTEST=/tmp|LOCKINGTEST=/tmp|" \
+ -i Makefile || die "sed failed"
+
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ cd "${S}"/new || die
+ insinto /usr/bin
+ insopts -m 6755
+ doins procmail
+
+ doins lockfile
+ fowners root:mail /usr/bin/lockfile
+ fperms 2755 /usr/bin/lockfile
+
+ dobin formail mailstat
+ insopts -m 0644
+
+ doman *.1 *.5
+
+ cd "${S}" || die
+ dodoc FAQ FEATURES HISTORY INSTALL KNOWN_BUGS README
+
+ insinto /etc
+ doins procmailrc
+
+ docinto examples
+ dodoc examples/*
+}
+
+pkg_postinst() {
+ if ! use mbox ; then
+ elog "Starting with mail-filter/procmail-3.22-r9 you'll
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: f7d7ce36a2bb31076675db730290687ffc76f315
Author: Fabian Groffen gentoo org>
AuthorDate: Fri Jun 3 08:11:06 2022 +
Commit: Fabian Groffen gentoo org>
CommitDate: Fri Jun 3 08:11:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7d7ce36
mail-filter/procmail-3.22-r15: marked ~arm64
Signed-off-by: Fabian Groffen gentoo.org>
mail-filter/procmail/procmail-3.22-r15.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-filter/procmail/procmail-3.22-r15.ebuild
b/mail-filter/procmail/procmail-3.22-r15.ebuild
index cbdc4d089194..4d8764f0af5a 100644
--- a/mail-filter/procmail/procmail-3.22-r15.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.procmail.org/${P}.tar.gz;
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris
~x86-solaris"
IUSE="mbox selinux"
DEPEND="acct-group/mail
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: 98e563892d98c7995b23e2b0fea640a0643e4ec9
Author: Marek Szuba gentoo org>
AuthorDate: Fri Jul 23 16:12:05 2021 +
Commit: Marek Szuba gentoo org>
CommitDate: Fri Jul 23 18:28:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98e56389
mail-filter/procmail: keyword 3.22-r15 for ~riscv
Signed-off-by: Marek Szuba gentoo.org>
mail-filter/procmail/procmail-3.22-r15.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/procmail/procmail-3.22-r15.ebuild
b/mail-filter/procmail/procmail-3.22-r15.ebuild
index c02cde9cd8c..cbdc4d08919 100644
--- a/mail-filter/procmail/procmail-3.22-r15.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.procmail.org/${P}.tar.gz;
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
IUSE="mbox selinux"
DEPEND="acct-group/mail
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: 767f20cb0801b23f5676716a08ae3f3483a21d0d
Author: Mikle Kolyada gentoo org>
AuthorDate: Tue Apr 20 11:39:28 2021 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Tue Apr 20 11:39:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=767f20cb
mail-filter/procmail: missing mail group dep
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Mikle Kolyada gentoo.org>
.../procmail/{procmail-3.22-r14.ebuild => procmail-3.22-r15.ebuild}| 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/mail-filter/procmail/procmail-3.22-r14.ebuild
b/mail-filter/procmail/procmail-3.22-r15.ebuild
similarity index 98%
rename from mail-filter/procmail/procmail-3.22-r14.ebuild
rename to mail-filter/procmail/procmail-3.22-r15.ebuild
index a6c3facf7b9..c02cde9cd8c 100644
--- a/mail-filter/procmail/procmail-3.22-r14.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r15.ebuild
@@ -14,7 +14,8 @@ SLOT="0"
KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
IUSE="mbox selinux"
-DEPEND="virtual/mta"
+DEPEND="acct-group/mail
+ virtual/mta"
RDEPEND="selinux? ( sec-policy/selinux-procmail )"
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: 49dc30dbbbcc9ae9f35083cf93efdcd9cafa9e20
Author: Fabian Groffen gentoo org>
AuthorDate: Wed Jan 6 13:49:55 2021 +
Commit: Fabian Groffen gentoo org>
CommitDate: Wed Jan 6 13:49:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49dc30db
mail-filter/procmail: drop x86-macos
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen gentoo.org>
mail-filter/procmail/procmail-3.22-r14.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-filter/procmail/procmail-3.22-r14.ebuild
b/mail-filter/procmail/procmail-3.22-r14.ebuild
index 1d902b0f862..47a3f029c6a 100644
--- a/mail-filter/procmail/procmail-3.22-r14.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.procmail.org/${P}.tar.gz;
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
IUSE="mbox selinux"
DEPEND="virtual/mta"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: a62b633c5c4c9963162355f1be96c7c28ced1f9b
Author: Stephan Hartmann googlemail com>
AuthorDate: Sun Jul 5 11:38:20 2020 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Thu Jul 16 08:45:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a62b633c
mail-filter/procmail: fix building with clang
Closes: https://bugs.gentoo.org/730846
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Stephan Hartmann googlemail.com>
Closes: https://github.com/gentoo/gentoo/pull/16595
Signed-off-by: Mikle Kolyada gentoo.org>
mail-filter/procmail/procmail-3.22-r14.ebuild | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/mail-filter/procmail/procmail-3.22-r14.ebuild
b/mail-filter/procmail/procmail-3.22-r14.ebuild
index 3abc7cf7a8a..1d902b0f862 100644
--- a/mail-filter/procmail/procmail-3.22-r14.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r14.ebuild
@@ -69,10 +69,8 @@ src_compile() {
# To work around this, we append -fno-inline-functions to CFLAGS
# Since GCC 4.7 we also need -fno-ipa-cp-clone (bug #466552)
# If it's clang, ignore -fno-ipa-cp-clone, as clang doesn't support this
- case "$(tc-getCC)" in
- "clang") append-flags -fno-inline-functions ;;
- "gcc"|*) append-flags -fno-inline-functions -fno-ipa-cp-clone ;;
- esac
+ append-flags -fno-inline-functions
+ tc-is-clang || append-flags -fno-ipa-cp-clone
sed -e "s|CFLAGS0 = -O|CFLAGS0 = ${CFLAGS}|" \
-e "s|LDFLAGS0= -s|LDFLAGS0 = ${LDFLAGS}|" \
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: 84a277fe3bdf91b14eccd0a1621c034a7de6f545
Author: Mikle Kolyada gentoo org>
AuthorDate: Fri Feb 21 18:30:17 2020 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Fri Feb 21 18:33:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84a277fe
mail-filter/procmail: replace sed separators
Closes: https://bugs.gentoo.org/710424
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mikle Kolyada gentoo.org>
mail-filter/procmail/procmail-3.22-r14.ebuild | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/mail-filter/procmail/procmail-3.22-r14.ebuild
b/mail-filter/procmail/procmail-3.22-r14.ebuild
index f8caa1c551b..ca949f0929c 100644
--- a/mail-filter/procmail/procmail-3.22-r14.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r14.ebuild
@@ -21,7 +21,7 @@ src_prepare() {
# disable flock, using both fcntl and flock style locking
# doesn't work with NFS with 2.6.17+ kernels, bug #156493
- sed -e "s:/\*#define NO_flock_LOCK:#define NO_flock_LOCK:" \
+ sed -e "s|/\*#define NO_flock_LOCK|#define NO_flock_LOCK|" \
-i config.h || die "sed failed"
if ! use mbox ; then
@@ -74,10 +74,10 @@ src_compile() {
"gcc"|*) append-flags -fno-inline-functions -fno-ipa-cp-clone ;;
esac
- sed -e "s:CFLAGS0 = -O:CFLAGS0 = ${CFLAGS}:" \
- -e "s:LDFLAGS0= -s:LDFLAGS0 = ${LDFLAGS}:" \
- -e "s:LOCKINGTEST=__defaults__:#LOCKINGTEST=__defaults__:" \
- -e "s:#LOCKINGTEST=/tmp:LOCKINGTEST=/tmp:" \
+ sed -e "s|CFLAGS0 = -O|CFLAGS0 = ${CFLAGS}|" \
+ -e "s|LDFLAGS0= -s|LDFLAGS0 = ${LDFLAGS}|" \
+ -e "s|LOCKINGTEST=__defaults__|#LOCKINGTEST=__defaults__|" \
+ -e "s|#LOCKINGTEST=/tmp|LOCKINGTEST=/tmp|" \
-i Makefile || die "sed failed"
emake CC="$(tc-getCC)"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: aba61213a94325a7f7e9bd8f9f3b11a2b520cb38 Author: Mikle Kolyada gentoo org> AuthorDate: Sun Sep 15 20:50:10 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun Sep 15 20:50:10 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aba61213 mail-filter/procmail: Add myself explicitly Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Mikle Kolyada gentoo.org> mail-filter/procmail/metadata.xml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mail-filter/procmail/metadata.xml b/mail-filter/procmail/metadata.xml index 6f49eba8f49..bbd34d5b759 100644 --- a/mail-filter/procmail/metadata.xml +++ b/mail-filter/procmail/metadata.xml @@ -1,5 +1,8 @@ http://www.gentoo.org/dtd/metadata.dtd;> - + +zlog...@gentoo.org +Mikle Kolyada +
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: 43511d7bd1cb514c7ad856f2b0f46b805e5bb716
Author: Mikle Kolyada gentoo org>
AuthorDate: Sat Apr 6 16:36:53 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sat Apr 6 16:36:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43511d7b
mail-filter/procmail: hppa stable wrt bug #638108
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="hppa"
mail-filter/procmail/procmail-3.22-r14.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/procmail/procmail-3.22-r14.ebuild
b/mail-filter/procmail/procmail-3.22-r14.ebuild
index 729ab95e974..2f2f7813b0d 100644
--- a/mail-filter/procmail/procmail-3.22-r14.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.procmail.org/${P}.tar.gz;
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x86-solaris"
IUSE="mbox selinux"
DEPEND="virtual/mta"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: 0b12911c4c7eeb1eaefa34dde3439df4fa696a60
Author: Mikle Kolyada gentoo org>
AuthorDate: Sat Apr 6 16:38:11 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sat Apr 6 16:38:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b12911c
mail-filter/procmail: sh stable wrt bug #638108
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="sh"
mail-filter/procmail/procmail-3.22-r14.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/procmail/procmail-3.22-r14.ebuild
b/mail-filter/procmail/procmail-3.22-r14.ebuild
index 78458fc534d..4d67def38fa 100644
--- a/mail-filter/procmail/procmail-3.22-r14.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.procmail.org/${P}.tar.gz;
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x86-solaris"
IUSE="mbox selinux"
DEPEND="virtual/mta"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: 132fbb1f433069aa9fddb24cede7d9de12eafb43
Author: Mikle Kolyada gentoo org>
AuthorDate: Sat Apr 6 16:36:09 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sat Apr 6 16:36:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=132fbb1f
mail-filter/procmail: ppc64 stable wrt bug #638108
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="ppc64"
mail-filter/procmail/procmail-3.22-r14.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/procmail/procmail-3.22-r14.ebuild
b/mail-filter/procmail/procmail-3.22-r14.ebuild
index 08baf83d231..0a678b3dd3e 100644
--- a/mail-filter/procmail/procmail-3.22-r14.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.procmail.org/${P}.tar.gz;
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x86-solaris"
IUSE="mbox selinux"
DEPEND="virtual/mta"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: 5de64f8bbb18652ec3f1496466472774b7ec9dfb
Author: Mikle Kolyada gentoo org>
AuthorDate: Sat Apr 6 16:40:39 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sat Apr 6 16:40:39 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5de64f8b
mail-filter/procmail: Drop old
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
mail-filter/procmail/procmail-3.22-r10.ebuild | 109 ---
mail-filter/procmail/procmail-3.22-r11.ebuild | 120 --
2 files changed, 229 deletions(-)
diff --git a/mail-filter/procmail/procmail-3.22-r10.ebuild
b/mail-filter/procmail/procmail-3.22-r10.ebuild
deleted file mode 100644
index 44d9cfd6ede..000
--- a/mail-filter/procmail/procmail-3.22-r10.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils flag-o-matic toolchain-funcs prefix
-
-DESCRIPTION="Mail delivery agent/filter"
-HOMEPAGE="http://www.procmail.org/;
-SRC_URI="http://www.procmail.org/${P}.tar.gz;
-
-LICENSE="|| ( Artistic GPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x86-solaris"
-IUSE="mbox selinux"
-
-DEPEND="virtual/mta"
-RDEPEND="selinux? ( sec-policy/selinux-procmail )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # disable flock, using both fcntl and flock style locking
- # doesn't work with NFS with 2.6.17+ kernels, bug #156493
-
- sed -e "s:/\*#define NO_flock_LOCK:#define NO_flock_LOCK:" \
- -i config.h || die "sed failed"
-
- if ! use mbox ; then
- echo "# Use maildir-style mailbox in user's home directory" >
"${S}"/procmailrc
- echo 'DEFAULT=$HOME/.maildir/' >> "${S}"/procmailrc
- cd "${S}"
- epatch "${FILESDIR}/gentoo-maildir3.diff"
- else
- echo '# Use mbox-style mailbox in /var/spool/mail' >
"${S}"/procmailrc
- echo 'DEFAULT=${EPREFIX}/var/spool/mail/$LOGNAME' >>
"${S}"/procmailrc
- fi
-
- # Do not use lazy bindings on lockfile and procmail
- if [[ ${CHOST} != *-darwin* ]]; then
- epatch "${FILESDIR}/${PN}-lazy-bindings.diff"
- fi
-
- # Fix for bug #102340
- epatch "${FILESDIR}/${PN}-comsat-segfault.diff"
-
- # Fix for bug #119890
- epatch "${FILESDIR}/${PN}-maxprocs-fix.diff"
-
- # Prefixify config.h
- epatch "${FILESDIR}"/${PN}-prefix.patch
- eprefixify config.h Makefile src/autoconf src/recommend.c
-
- # Fix for bug #26
- epatch "${FILESDIR}/${PN}-pipealloc.diff"
-
- # Fix for bug #270551
- epatch "${FILESDIR}/${PN}-3.22-glibc-2.10.patch"
-}
-
-src_compile() {
- # -finline-functions (implied by -O3) leaves strstr() in an infinite
loop.
- # To work around this, we append -fno-inline-functions to CFLAGS
- # Since GCC 4.7 we also need -fno-ipa-cp-clone (bug #466552)
- append-flags -fno-inline-functions -fno-ipa-cp-clone
-
- sed -e "s:CFLAGS0 = -O:CFLAGS0 = ${CFLAGS}:" \
- -e "s:LDFLAGS0= -s:LDFLAGS0 = ${LDFLAGS}:" \
- -e "s:LOCKINGTEST=__defaults__:#LOCKINGTEST=__defaults__:" \
- -e "s:#LOCKINGTEST=/tmp:LOCKINGTEST=/tmp:" \
- -i Makefile || die "sed failed"
-
- emake CC="$(tc-getCC)" || die
-}
-
-src_install() {
- cd "${S}"/new
- insinto /usr/bin
- insopts -m 6755
- doins procmail || die
-
- doins lockfile || die
- fowners root:mail /usr/bin/lockfile
- fperms 2755 /usr/bin/lockfile
-
- dobin formail mailstat || die
- insopts -m 0644
-
- doman *.1 *.5
-
- cd "${S}"
- dodoc FAQ FEATURES HISTORY INSTALL KNOWN_BUGS README
-
- insinto /etc
- doins procmailrc || die
-
- docinto examples
- dodoc examples/*
-}
-
-pkg_postinst() {
- if ! use mbox ; then
- elog "Starting with mail-filter/procmail-3.22-r9 you'll need to
ensure"
- elog "that you configure a mail storage location using DEFAULT
in"
- elog "/etc/procmailrc, for example:"
- elog "\tDEFAULT=\$HOME/.maildir/"
- fi
-}
diff --git a/mail-filter/procmail/procmail-3.22-r11.ebuild
b/mail-filter/procmail/procmail-3.22-r11.ebuild
deleted file mode 100644
index c717564afa4..000
--- a/mail-filter/procmail/procmail-3.22-r11.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs prefix
-
-DESCRIPTION="Mail delivery agent/filter"
-HOMEPAGE="http://www.procmail.org/;
-SRC_URI="http://www.procmail.org/${P}.tar.gz;
-
-LICENSE="|| (
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: 233593522bb4573b408b121bb3206384b5116695
Author: Mikle Kolyada gentoo org>
AuthorDate: Sat Apr 6 16:37:53 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sat Apr 6 16:37:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23359352
mail-filter/procmail: s390 stable wrt bug #638108
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="s390"
mail-filter/procmail/procmail-3.22-r14.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/procmail/procmail-3.22-r14.ebuild
b/mail-filter/procmail/procmail-3.22-r14.ebuild
index 25844728d8b..78458fc534d 100644
--- a/mail-filter/procmail/procmail-3.22-r14.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.procmail.org/${P}.tar.gz;
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x86-solaris"
IUSE="mbox selinux"
DEPEND="virtual/mta"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: b93446e4ab0b5b38b5c610b253fa43ea3d423938
Author: Mikle Kolyada gentoo org>
AuthorDate: Sat Apr 6 16:35:37 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sat Apr 6 16:35:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b93446e4
mail-filter/procmail: ppc stable wrt bug #638108
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="ppc"
mail-filter/procmail/procmail-3.22-r14.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/procmail/procmail-3.22-r14.ebuild
b/mail-filter/procmail/procmail-3.22-r14.ebuild
index c23341b477e..08baf83d231 100644
--- a/mail-filter/procmail/procmail-3.22-r14.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.procmail.org/${P}.tar.gz;
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x86-solaris"
IUSE="mbox selinux"
DEPEND="virtual/mta"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: 53d8d72acb88566e69b9a53ff2fe8b32fb2387a7
Author: Mikle Kolyada gentoo org>
AuthorDate: Sat Apr 6 16:36:34 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sat Apr 6 16:36:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53d8d72a
mail-filter/procmail: sparc stable wrt bug #638108
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="sparc"
mail-filter/procmail/procmail-3.22-r14.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/procmail/procmail-3.22-r14.ebuild
b/mail-filter/procmail/procmail-3.22-r14.ebuild
index 0a678b3dd3e..729ab95e974 100644
--- a/mail-filter/procmail/procmail-3.22-r14.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.procmail.org/${P}.tar.gz;
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x86-solaris"
IUSE="mbox selinux"
DEPEND="virtual/mta"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: 81c96a55a7cf15cb64ed545407790b8c2dc64da8
Author: Mikle Kolyada gentoo org>
AuthorDate: Sat Apr 6 16:37:34 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sat Apr 6 16:37:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81c96a55
mail-filter/procmail: ia64 stable wrt bug #638108
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="ia64"
mail-filter/procmail/procmail-3.22-r14.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/procmail/procmail-3.22-r14.ebuild
b/mail-filter/procmail/procmail-3.22-r14.ebuild
index 2f2f7813b0d..25844728d8b 100644
--- a/mail-filter/procmail/procmail-3.22-r14.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.procmail.org/${P}.tar.gz;
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x86-solaris"
IUSE="mbox selinux"
DEPEND="virtual/mta"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: d396811b92066ba11693dca848845308619eca64
Author: Mikle Kolyada gentoo org>
AuthorDate: Tue Apr 2 09:40:24 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Tue Apr 2 09:40:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d396811b
mail-filter/procmail: alpha stable wrt bug #638108
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="alpha"
mail-filter/procmail/procmail-3.22-r14.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/procmail/procmail-3.22-r14.ebuild
b/mail-filter/procmail/procmail-3.22-r14.ebuild
index 39e3663cf28..c23341b477e 100644
--- a/mail-filter/procmail/procmail-3.22-r14.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.procmail.org/${P}.tar.gz;
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x86-solaris"
IUSE="mbox selinux"
DEPEND="virtual/mta"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: 16a4b7c32d93c6dc639a0793cfb37c32ff686e82
Author: Mikle Kolyada gentoo org>
AuthorDate: Tue Apr 2 09:39:58 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Tue Apr 2 09:39:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16a4b7c3
mail-filter/procmail: arm stable wrt bug #638108
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="arm"
mail-filter/procmail/procmail-3.22-r14.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/procmail/procmail-3.22-r14.ebuild
b/mail-filter/procmail/procmail-3.22-r14.ebuild
index e8f32dce324..39e3663cf28 100644
--- a/mail-filter/procmail/procmail-3.22-r14.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.procmail.org/${P}.tar.gz;
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x86-solaris"
IUSE="mbox selinux"
DEPEND="virtual/mta"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: cdfd667d19b0fda964c955920ee515c7c038b953
Author: Thomas Deutschmann gentoo org>
AuthorDate: Tue Apr 2 01:26:47 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Tue Apr 2 01:26:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdfd667d
mail-filter/procmail: x86 stable (bug #638108)
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann gentoo.org>
mail-filter/procmail/procmail-3.22-r14.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/procmail/procmail-3.22-r14.ebuild
b/mail-filter/procmail/procmail-3.22-r14.ebuild
index d99a4ffde72..e8f32dce324 100644
--- a/mail-filter/procmail/procmail-3.22-r14.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.procmail.org/${P}.tar.gz;
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x86-solaris"
IUSE="mbox selinux"
DEPEND="virtual/mta"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/files/, mail-filter/procmail/
commit: ff36e4f6862f3949e3bfedd7bb352cd9d0602ffe
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sat Mar 30 17:02:56 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sat Mar 30 17:02:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff36e4f6
mail-filter/procmail: replace patch for CVE-2014-3618
Fixes an infinite loop.
Bug: https://bugs.gentoo.org/638108
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann gentoo.org>
.../files/procmail-3.22-CVE-2014-3618.patch| 18
.../files/procmail-3.22-CVE-2017-16844.patch | 13 +++
.../files/procmail-CVE-2014-3618-16844.patch | 25 --
...il-3.22-r13.ebuild => procmail-3.22-r14.ebuild} | 3 ++-
4 files changed, 33 insertions(+), 26 deletions(-)
diff --git a/mail-filter/procmail/files/procmail-3.22-CVE-2014-3618.patch
b/mail-filter/procmail/files/procmail-3.22-CVE-2014-3618.patch
new file mode 100644
index 000..124d1f99685
--- /dev/null
+++ b/mail-filter/procmail/files/procmail-3.22-CVE-2014-3618.patch
@@ -0,0 +1,18 @@
+diff --git a/src/formisc.c b/src/formisc.c
+index 338733b..c48df52 100644
+--- a/src/formisc.c
b/src/formisc.c
+@@ -84,12 +84,11 @@ normal: *target++= *start++;
+ case '"':*target++=delim='"';start++;
+ }
+ ;{ int i;
+- do
++ while(*start) /* anything? */
+ if((i= *target++= *start++)==delim) /* corresponding delimiter? */
+ break;
+ else if(i=='\\'&&*start) /* skip quoted character */
+ *target++= *start++;
+- while(*start); /* anything? */
+ }
+ hitspc=2;
+}
diff --git a/mail-filter/procmail/files/procmail-3.22-CVE-2017-16844.patch
b/mail-filter/procmail/files/procmail-3.22-CVE-2017-16844.patch
new file mode 100644
index 000..5e610d723da
--- /dev/null
+++ b/mail-filter/procmail/files/procmail-3.22-CVE-2017-16844.patch
@@ -0,0 +1,13 @@
+diff --git a/src/formisc.c b/src/formisc.c
+index 5c2869d..54fd013 100644
+--- a/src/formisc.c
b/src/formisc.c
+@@ -103,7 +103,7 @@ void loadsaved(sp)const struct saved*const sp; /*
load some saved text */
+ }
+ /* append to buf */
+ void loadbuf(text,len)const char*const text;const size_t len;
+-{ if(buffilled+len>buflen) /* buf can't hold the text */
++{ while(buffilled+len>buflen) /* buf can't hold the text */
+ buf=realloc(buf,buflen+=Bsize);
+ tmemmove(buf+buffilled,text,len);buffilled+=len;
+ }
diff --git a/mail-filter/procmail/files/procmail-CVE-2014-3618-16844.patch
b/mail-filter/procmail/files/procmail-CVE-2014-3618-16844.patch
deleted file mode 100644
index 4f1714063c9..000
--- a/mail-filter/procmail/files/procmail-CVE-2014-3618-16844.patch
+++ /dev/null
@@ -1,25 +0,0 @@
a/src/formisc.c2019-03-23 19:52:18.450174402 -0400
-+++ b/src/formisc.c2019-03-23 19:52:47.914351039 -0400
-@@ -84,12 +84,11 @@
- case '"':*target++=delim='"';start++;
- }
- ;{ int i;
-- do
-+ while(*start);
- if((i= *target++= *start++)==delim) /* corresponding delimiter? */
- break;
- else if(i=='\\'&&*start) /* skip quoted character */
- *target++= *start++;
-- while(*start); /* anything? */
- }
- hitspc=2;
-}
-@@ -104,7 +103,7 @@
- }
- /* append to buf */
- void loadbuf(text,len)const char*const text;const size_t len;
--{ if(buffilled+len>buflen) /* buf can't hold the text */
-+{ while(buffilled+len>buflen) /* buf can't hold the text */
- buf=realloc(buf,buflen+=Bsize);
- tmemmove(buf+buffilled,text,len);buffilled+=len;
- }
diff --git a/mail-filter/procmail/procmail-3.22-r13.ebuild
b/mail-filter/procmail/procmail-3.22-r14.ebuild
similarity index 97%
rename from mail-filter/procmail/procmail-3.22-r13.ebuild
rename to mail-filter/procmail/procmail-3.22-r14.ebuild
index 9534c350bf8..d99a4ffde72 100644
--- a/mail-filter/procmail/procmail-3.22-r13.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r14.ebuild
@@ -56,7 +56,8 @@ src_prepare() {
eapply "${FILESDIR}/${PN}-3.22-glibc-2.10.patch"
# Fix security bugs #522114 and #638108
- eapply "${FILESDIR}/${PN}-CVE-2014-3618-16844.patch"
+ eapply "${FILESDIR}/${PN}-3.22-CVE-2014-3618.patch"
+ eapply "${FILESDIR}/${PN}-3.22-CVE-2017-16844.patch"
eapply "${FILESDIR}/${PN}-3.22-crash-fix.patch"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/files/
commit: 8f11bfb27b252b05372a3c15a7f5842f12052f5f
Author: Patrice Clement gentoo org>
AuthorDate: Fri Mar 29 08:28:50 2019 +
Commit: Patrice Clement gentoo org>
CommitDate: Fri Mar 29 08:29:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f11bfb2
mail-filter/procmail: add back needed patch.
Closes: https://bugs.gentoo.org/681978
Signed-off-by: Patrice Clement gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
.../files/procmail-CVE-2014-3618-16844.patch | 25 ++
1 file changed, 25 insertions(+)
diff --git a/mail-filter/procmail/files/procmail-CVE-2014-3618-16844.patch
b/mail-filter/procmail/files/procmail-CVE-2014-3618-16844.patch
new file mode 100644
index 000..4f1714063c9
--- /dev/null
+++ b/mail-filter/procmail/files/procmail-CVE-2014-3618-16844.patch
@@ -0,0 +1,25 @@
+--- a/src/formisc.c2019-03-23 19:52:18.450174402 -0400
b/src/formisc.c2019-03-23 19:52:47.914351039 -0400
+@@ -84,12 +84,11 @@
+ case '"':*target++=delim='"';start++;
+ }
+ ;{ int i;
+- do
++ while(*start);
+ if((i= *target++= *start++)==delim) /* corresponding delimiter? */
+ break;
+ else if(i=='\\'&&*start) /* skip quoted character */
+ *target++= *start++;
+- while(*start); /* anything? */
+ }
+ hitspc=2;
+}
+@@ -104,7 +103,7 @@
+ }
+ /* append to buf */
+ void loadbuf(text,len)const char*const text;const size_t len;
+-{ if(buffilled+len>buflen) /* buf can't hold the text */
++{ while(buffilled+len>buflen) /* buf can't hold the text */
+ buf=realloc(buf,buflen+=Bsize);
+ tmemmove(buf+buffilled,text,len);buffilled+=len;
+ }
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/files/
commit: 73e8272b30ff09ce99ccb4d49a7ad1ca2e72aa28
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Wed Mar 27 06:05:37 2019 +
Commit: Patrice Clement gentoo org>
CommitDate: Thu Mar 28 23:12:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73e8272b
mail-filter/procmail: remove unused patch.
Signed-off-by: Michael Mair-Keimberger gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11514
Signed-off-by: Patrice Clement gentoo.org>
.../files/procmail-CVE-2014-3618-16844.patch | 25 --
1 file changed, 25 deletions(-)
diff --git a/mail-filter/procmail/files/procmail-CVE-2014-3618-16844.patch
b/mail-filter/procmail/files/procmail-CVE-2014-3618-16844.patch
deleted file mode 100644
index 4f1714063c9..000
--- a/mail-filter/procmail/files/procmail-CVE-2014-3618-16844.patch
+++ /dev/null
@@ -1,25 +0,0 @@
a/src/formisc.c2019-03-23 19:52:18.450174402 -0400
-+++ b/src/formisc.c2019-03-23 19:52:47.914351039 -0400
-@@ -84,12 +84,11 @@
- case '"':*target++=delim='"';start++;
- }
- ;{ int i;
-- do
-+ while(*start);
- if((i= *target++= *start++)==delim) /* corresponding delimiter? */
- break;
- else if(i=='\\'&&*start) /* skip quoted character */
- *target++= *start++;
-- while(*start); /* anything? */
- }
- hitspc=2;
-}
-@@ -104,7 +103,7 @@
- }
- /* append to buf */
- void loadbuf(text,len)const char*const text;const size_t len;
--{ if(buffilled+len>buflen) /* buf can't hold the text */
-+{ while(buffilled+len>buflen) /* buf can't hold the text */
- buf=realloc(buf,buflen+=Bsize);
- tmemmove(buf+buffilled,text,len);buffilled+=len;
- }
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: a39a59a050c40705318c32366a717fb4ef7a9629
Author: Mikle Kolyada gentoo org>
AuthorDate: Thu Mar 28 07:00:44 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Thu Mar 28 07:00:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a39a59a0
mail-filter/procmail: amd64 stable wrt bug #638108
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"
mail-filter/procmail/procmail-3.22-r13.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/procmail/procmail-3.22-r13.ebuild
b/mail-filter/procmail/procmail-3.22-r13.ebuild
index 9597d1ca647..9534c350bf8 100644
--- a/mail-filter/procmail/procmail-3.22-r13.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.procmail.org/${P}.tar.gz;
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
~sparc64-solaris ~x86-solaris"
IUSE="mbox selinux"
DEPEND="virtual/mta"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/files/, mail-filter/procmail/
commit: 038c9f3140b69054f3de9cb4f1a6ccf292510952
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Mar 28 00:44:20 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Mar 28 00:44:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=038c9f31
mail-filter/procmail: re-add security fix with crash fix
Bug: https://bugs.gentoo.org/638108
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann gentoo.org>
.../procmail/files/procmail-3.22-crash-fix.patch | 58 ++
mail-filter/procmail/procmail-3.22-r13.ebuild | 125 +
2 files changed, 183 insertions(+)
diff --git a/mail-filter/procmail/files/procmail-3.22-crash-fix.patch
b/mail-filter/procmail/files/procmail-3.22-crash-fix.patch
new file mode 100644
index 000..8563ea3d1d4
--- /dev/null
+++ b/mail-filter/procmail/files/procmail-3.22-crash-fix.patch
@@ -0,0 +1,58 @@
+diff --git a/src/cstdio.c b/src/cstdio.c
+index 7b6fe6d..0a0bd5b 100644
+--- a/src/cstdio.c
b/src/cstdio.c
+@@ -144,7 +144,7 @@ int getbl(p,end)char*p,*end;
/* my gets */
+ { case '\n':case EOF:*q='\0';
+ return overflow?-1:p!=q; /* did we read anything at all? */
+ }
+- if(q==end) /* check here so that a trailing backslash won't be
lost */
++ if(q>=end) /* check here so that a trailing backslash won't be
lost */
+ q=p,overflow=1;
+ *q++=i;
+}
+@@ -199,7 +199,7 @@ int getlline(target,end)char*target,*end;
+ if(*(target=strchr(target,'\0')-1)=='\\')
+ { if(chp2!=target)/* non-empty line? */
+target++;/* then preserve the backslash */
+-if(target>end-2)/* space enough for getbl? */
++if(target>=end-2) /* space enough for getbl? */
+target=end-linebuf,overflow=1; /* toss what we have */
+ continue;
+ }
+diff --git a/src/formail.c b/src/formail.c
+index 1f5c9dd..49b9967 100644
+--- a/src/formail.c
b/src/formail.c
+@@ -219,7 +219,8 @@ static
char*getsender(namep,fldp,headreply)char*namep;struct field*fldp;
+ if(i>=0&&(i!=maxindex(sest)||fldp==rdheader)) /* found
anything? */
+{ char*saddr;char*tmp; /* determine the weight */
+
nowm=areply&?headreply==1?sest[i].wrepl:sest[i].wrrepl:i;chp+=j;
+- tmp=malloc(j=fldp->Tot_len-j);tmemmove(tmp,chp,j);(chp=tmp)[j-1]='\0';
++ tmp=malloc((j=fldp->Tot_len-j) +
1);tmemmove(tmp,chp,j);(chp=tmp)[j-1]='\0';
++ chp[j]='\0';
+ if(sest[i].head==From_)
+ { char*pastad;
+ if(strchr(saddr=chp,'\n')) /* multiple From_ lines */
+@@ -364,7 +365,7 @@ static PROGID;
+
+ int main(lastm,argv)int lastm;const char*const argv[];
+ { int i,split=0,force=0,bogus=1,every=0,headreply=0,digest=0,nowait=0,keepb=0,
+- minfields=(char*)progid-(char*)progid,conctenate=0,babyl=0,babylstart,
++ minfields=(char*)progid-(char*)progid,conctenate=0,babyl=0,babylstart=0,
+berkeley=0,forgetclen;
+ long maxlen,ctlength;FILE*idcache=0;pid_t thepid;
+ size_t j,lnl,escaplen;char*chp,*namep,*escap=ESCAP;
+diff --git a/src/formisc.c b/src/formisc.c
+index c48df52..5c2869d 100644
+--- a/src/formisc.c
b/src/formisc.c
+@@ -66,7 +66,7 @@ inc:start++;
+ retz: *target='\0';
+ ret:return start;
+ }
+- if(*start=='\\')
++ if(*start=='\\' && *(start + 1))
+ *target++='\\',start++;
+ hitspc=2;
+ goto normal; /* normal word */
diff --git a/mail-filter/procmail/procmail-3.22-r13.ebuild
b/mail-filter/procmail/procmail-3.22-r13.ebuild
new file mode 100644
index 000..9597d1ca647
--- /dev/null
+++ b/mail-filter/procmail/procmail-3.22-r13.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs prefix
+
+DESCRIPTION="Mail delivery agent/filter"
+HOMEPAGE="http://www.procmail.org/;
+SRC_URI="http://www.procmail.org/${P}.tar.gz;
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
~sparc64-solaris ~x86-solaris"
+IUSE="mbox selinux"
+
+DEPEND="virtual/mta"
+RDEPEND="selinux? ( sec-policy/selinux-procmail )"
+
+src_prepare() {
+ # disable flock, using both fcntl and flock style locking
+ # doesn't work with NFS with 2.6.17+ kernels, bug #156493
+
+ sed -e "s:/\*#define NO_flock_LOCK:#define NO_flock_LOCK:" \
+ -i config.h || die "sed failed"
+
+ if ! use mbox ; then
+ echo "# Use maildir-style mailbox in user's home directory" >
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: 413a8971de686fb3bbaf8fc19c0485c5083aabdf
Author: Aaron Bauman gentoo org>
AuthorDate: Tue Mar 26 22:42:36 2019 +
Commit: Aaron Bauman gentoo org>
CommitDate: Tue Mar 26 22:43:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=413a8971
mail-filter/procmail: drop -r12
-r12 is being dropped due to multiple reports of loops causing CPU's to
be exhausted. This was confirmed by infra as well. Will address the
patches and hopefully find an alternative approach.
Signed-off-by: Aaron Bauman gentoo.org>
mail-filter/procmail/procmail-3.22-r12.ebuild | 123 --
1 file changed, 123 deletions(-)
diff --git a/mail-filter/procmail/procmail-3.22-r12.ebuild
b/mail-filter/procmail/procmail-3.22-r12.ebuild
deleted file mode 100644
index 90733d16fb6..000
--- a/mail-filter/procmail/procmail-3.22-r12.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs prefix
-
-DESCRIPTION="Mail delivery agent/filter"
-HOMEPAGE="http://www.procmail.org/;
-SRC_URI="http://www.procmail.org/${P}.tar.gz;
-
-LICENSE="|| ( Artistic GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x86-solaris"
-IUSE="mbox selinux"
-
-DEPEND="virtual/mta"
-RDEPEND="selinux? ( sec-policy/selinux-procmail )"
-
-src_prepare() {
- # disable flock, using both fcntl and flock style locking
- # doesn't work with NFS with 2.6.17+ kernels, bug #156493
-
- sed -e "s:/\*#define NO_flock_LOCK:#define NO_flock_LOCK:" \
- -i config.h || die "sed failed"
-
- if ! use mbox ; then
- echo "# Use maildir-style mailbox in user's home directory" >
"${S}"/procmailrc || die
- echo 'DEFAULT=$HOME/.maildir/' >> "${S}"/procmailrc || die
- cd "${S}" || die
- eapply "${FILESDIR}/gentoo-maildir3.diff"
- else
- echo '# Use mbox-style mailbox in /var/spool/mail' >
"${S}"/procmailrc || die
- echo 'DEFAULT=${EPREFIX}/var/spool/mail/$LOGNAME' >>
"${S}"/procmailrc || die
- fi
-
- # Do not use lazy bindings on lockfile and procmail
- if [[ ${CHOST} != *-darwin* ]]; then
- eapply -p0 "${FILESDIR}/${PN}-lazy-bindings.diff"
- fi
-
- # Fix for bug #102340
- eapply -p0 "${FILESDIR}/${PN}-comsat-segfault.diff"
-
- # Fix for bug #119890
- eapply -p0 "${FILESDIR}/${PN}-maxprocs-fix.diff"
-
- # Prefixify config.h
- eapply -p0 "${FILESDIR}"/${PN}-prefix.patch
- eprefixify config.h Makefile src/autoconf src/recommend.c
-
- # Fix for bug #26
- eapply "${FILESDIR}/${PN}-pipealloc.diff"
-
- # Fix for bug #270551
- eapply "${FILESDIR}/${PN}-3.22-glibc-2.10.patch"
-
- # Fix security bugs #522114 and #638108
- eapply "${FILESDIR}/${PN}-CVE-2014-3618-16844.patch"
-
- eapply_user
-}
-
-src_compile() {
- # -finline-functions (implied by -O3) leaves strstr() in an infinite
loop.
- # To work around this, we append -fno-inline-functions to CFLAGS
- # Since GCC 4.7 we also need -fno-ipa-cp-clone (bug #466552)
- # If it's clang, ignore -fno-ipa-cp-clone, as clang doesn't support this
- case "$(tc-getCC)" in
- "clang") append-flags -fno-inline-functions ;;
- "gcc"|*) append-flags -fno-inline-functions -fno-ipa-cp-clone ;;
- esac
-
- sed -e "s:CFLAGS0 = -O:CFLAGS0 = ${CFLAGS}:" \
- -e "s:LDFLAGS0= -s:LDFLAGS0 = ${LDFLAGS}:" \
- -e "s:LOCKINGTEST=__defaults__:#LOCKINGTEST=__defaults__:" \
- -e "s:#LOCKINGTEST=/tmp:LOCKINGTEST=/tmp:" \
- -i Makefile || die "sed failed"
-
- emake CC="$(tc-getCC)"
-}
-
-src_install() {
- cd "${S}"/new || die
- insinto /usr/bin
- insopts -m 6755
- doins procmail
-
- doins lockfile
- fowners root:mail /usr/bin/lockfile
- fperms 2755 /usr/bin/lockfile
-
- dobin formail mailstat
- insopts -m 0644
-
- doman *.1 *.5
-
- cd "${S}" || die
- dodoc FAQ FEATURES HISTORY INSTALL KNOWN_BUGS README
-
- insinto /etc
- doins procmailrc
-
- docinto examples
- dodoc examples/*
-}
-
-pkg_postinst() {
- if ! use mbox ; then
- elog "Starting with mail-filter/procmail-3.22-r9 you'll need to
ensure"
- elog "that you configure a mail storage location using DEFAULT
in"
- elog "/etc/procmailrc, for example:"
- elog "\tDEFAULT=\$HOME/.maildir/"
- fi
- if has sfperms ${FEATURES}; then
- ewarn "FEATURES=sfperms removes the read-bit for others from"
- ewarn " /usr/bin/procmail"
-
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: c63bf583a8d148364c38db37fb2db6cddd38f3f9
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Tue Mar 26 20:38:56 2019 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Tue Mar 26 21:09:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c63bf583
mail-filter/procmail: stable 3.22-r12 for sparc, bug #638108
Signed-off-by: Rolf Eike Beer sf-mail.de>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Sergei Trofimovich gentoo.org>
mail-filter/procmail/procmail-3.22-r12.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/procmail/procmail-3.22-r12.ebuild
b/mail-filter/procmail/procmail-3.22-r12.ebuild
index 1ed7a69e4a1..90733d16fb6 100644
--- a/mail-filter/procmail/procmail-3.22-r12.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.procmail.org/${P}.tar.gz;
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x86-solaris"
IUSE="mbox selinux"
DEPEND="virtual/mta"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: 93932a77b5d9f260ff247aa6a5fd8ab2414e39b0
Author: Sergei Trofimovich gentoo org>
AuthorDate: Mon Mar 25 22:15:13 2019 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Mon Mar 25 22:15:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93932a77
mail-filter/procmail: stable 3.22-r12 for hppa, bug #638108
Package-Manager: Portage-2.3.62, Repoman-2.3.12
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Sergei Trofimovich gentoo.org>
mail-filter/procmail/procmail-3.22-r12.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/procmail/procmail-3.22-r12.ebuild
b/mail-filter/procmail/procmail-3.22-r12.ebuild
index ccdd9e763ab..1ed7a69e4a1 100644
--- a/mail-filter/procmail/procmail-3.22-r12.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.procmail.org/${P}.tar.gz;
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x86-solaris"
IUSE="mbox selinux"
DEPEND="virtual/mta"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: a0582d6d0ff5b814dd595c266b5237a7419ae5b7
Author: Mikle Kolyada gentoo org>
AuthorDate: Mon Mar 25 11:48:53 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Mon Mar 25 11:48:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0582d6d
mail-filter/procmail: s390 stable wrt bug #638108
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="s390"
mail-filter/procmail/procmail-3.22-r12.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/procmail/procmail-3.22-r12.ebuild
b/mail-filter/procmail/procmail-3.22-r12.ebuild
index e62817fe6ef..ccdd9e763ab 100644
--- a/mail-filter/procmail/procmail-3.22-r12.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.procmail.org/${P}.tar.gz;
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x86-solaris"
IUSE="mbox selinux"
DEPEND="virtual/mta"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: 9773c7c76036cc67006a898a901f594eb7741425
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sun Mar 24 20:06:46 2019 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Mar 24 20:06:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9773c7c7
mail-filter/procmail: stable 3.22-r12 for ppc, bug #638108
Package-Manager: Portage-2.3.62, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich gentoo.org>
mail-filter/procmail/procmail-3.22-r12.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/procmail/procmail-3.22-r12.ebuild
b/mail-filter/procmail/procmail-3.22-r12.ebuild
index df067711e2d..8e18852d1b3 100644
--- a/mail-filter/procmail/procmail-3.22-r12.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.procmail.org/${P}.tar.gz;
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x86-solaris"
IUSE="mbox selinux"
DEPEND="virtual/mta"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: 35cd35e1f01cdbaab71257c92b10180600bab683
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sun Mar 24 19:39:36 2019 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Mar 24 19:39:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35cd35e1
mail-filter/procmail: stable 3.22-r12 for ia64, bug #638108
Package-Manager: Portage-2.3.62, Repoman-2.3.12
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich gentoo.org>
mail-filter/procmail/procmail-3.22-r12.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/procmail/procmail-3.22-r12.ebuild
b/mail-filter/procmail/procmail-3.22-r12.ebuild
index a0a75c0fb30..df067711e2d 100644
--- a/mail-filter/procmail/procmail-3.22-r12.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.procmail.org/${P}.tar.gz;
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x86-solaris"
IUSE="mbox selinux"
DEPEND="virtual/mta"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: c2d543e5e060df0597801b48334e0c4d880d1f25
Author: Richard Freeman gentoo org>
AuthorDate: Sun Mar 24 12:02:27 2019 +
Commit: Richard Freeman gentoo org>
CommitDate: Sun Mar 24 12:02:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2d543e5
mail-filter/procmail: amd64 stable
Bug: https://bugs.gentoo.org/638108
Signed-off-by: Richard Freeman gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
mail-filter/procmail/procmail-3.22-r12.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/procmail/procmail-3.22-r12.ebuild
b/mail-filter/procmail/procmail-3.22-r12.ebuild
index dc9660af9c1..a0a75c0fb30 100644
--- a/mail-filter/procmail/procmail-3.22-r12.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.procmail.org/${P}.tar.gz;
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
~sparc64-solaris ~x86-solaris"
IUSE="mbox selinux"
DEPEND="virtual/mta"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/files/, mail-filter/procmail/
commit: 31e0e8db9e641bbe158add9c6d4907f2c3eb2d57
Author: Aaron Bauman gentoo org>
AuthorDate: Sun Mar 24 00:22:31 2019 +
Commit: Aaron Bauman gentoo org>
CommitDate: Sun Mar 24 00:26:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31e0e8db
mail-filter/procmail: revbump to fix longstanding vulnerabilities
This patch is a combination of patches from the OSS ML and the Debian
bug tracker. Both patches and authors can be found in the below
referenced bugs.
Bug: https://bugs.gentoo.org/522114
Bug: https://bugs.gentoo.org/638108
Signed-off-by: Aaron Bauman gentoo.org>
.../files/procmail-CVE-2014-3618-16844.patch | 25 +
mail-filter/procmail/procmail-3.22-r12.ebuild | 123 +
2 files changed, 148 insertions(+)
diff --git a/mail-filter/procmail/files/procmail-CVE-2014-3618-16844.patch
b/mail-filter/procmail/files/procmail-CVE-2014-3618-16844.patch
new file mode 100644
index 000..4f1714063c9
--- /dev/null
+++ b/mail-filter/procmail/files/procmail-CVE-2014-3618-16844.patch
@@ -0,0 +1,25 @@
+--- a/src/formisc.c2019-03-23 19:52:18.450174402 -0400
b/src/formisc.c2019-03-23 19:52:47.914351039 -0400
+@@ -84,12 +84,11 @@
+ case '"':*target++=delim='"';start++;
+ }
+ ;{ int i;
+- do
++ while(*start);
+ if((i= *target++= *start++)==delim) /* corresponding delimiter? */
+ break;
+ else if(i=='\\'&&*start) /* skip quoted character */
+ *target++= *start++;
+- while(*start); /* anything? */
+ }
+ hitspc=2;
+}
+@@ -104,7 +103,7 @@
+ }
+ /* append to buf */
+ void loadbuf(text,len)const char*const text;const size_t len;
+-{ if(buffilled+len>buflen) /* buf can't hold the text */
++{ while(buffilled+len>buflen) /* buf can't hold the text */
+ buf=realloc(buf,buflen+=Bsize);
+ tmemmove(buf+buffilled,text,len);buffilled+=len;
+ }
diff --git a/mail-filter/procmail/procmail-3.22-r12.ebuild
b/mail-filter/procmail/procmail-3.22-r12.ebuild
new file mode 100644
index 000..dc9660af9c1
--- /dev/null
+++ b/mail-filter/procmail/procmail-3.22-r12.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs prefix
+
+DESCRIPTION="Mail delivery agent/filter"
+HOMEPAGE="http://www.procmail.org/;
+SRC_URI="http://www.procmail.org/${P}.tar.gz;
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
~sparc64-solaris ~x86-solaris"
+IUSE="mbox selinux"
+
+DEPEND="virtual/mta"
+RDEPEND="selinux? ( sec-policy/selinux-procmail )"
+
+src_prepare() {
+ # disable flock, using both fcntl and flock style locking
+ # doesn't work with NFS with 2.6.17+ kernels, bug #156493
+
+ sed -e "s:/\*#define NO_flock_LOCK:#define NO_flock_LOCK:" \
+ -i config.h || die "sed failed"
+
+ if ! use mbox ; then
+ echo "# Use maildir-style mailbox in user's home directory" >
"${S}"/procmailrc || die
+ echo 'DEFAULT=$HOME/.maildir/' >> "${S}"/procmailrc || die
+ cd "${S}" || die
+ eapply "${FILESDIR}/gentoo-maildir3.diff"
+ else
+ echo '# Use mbox-style mailbox in /var/spool/mail' >
"${S}"/procmailrc || die
+ echo 'DEFAULT=${EPREFIX}/var/spool/mail/$LOGNAME' >>
"${S}"/procmailrc || die
+ fi
+
+ # Do not use lazy bindings on lockfile and procmail
+ if [[ ${CHOST} != *-darwin* ]]; then
+ eapply -p0 "${FILESDIR}/${PN}-lazy-bindings.diff"
+ fi
+
+ # Fix for bug #102340
+ eapply -p0 "${FILESDIR}/${PN}-comsat-segfault.diff"
+
+ # Fix for bug #119890
+ eapply -p0 "${FILESDIR}/${PN}-maxprocs-fix.diff"
+
+ # Prefixify config.h
+ eapply -p0 "${FILESDIR}"/${PN}-prefix.patch
+ eprefixify config.h Makefile src/autoconf src/recommend.c
+
+ # Fix for bug #26
+ eapply "${FILESDIR}/${PN}-pipealloc.diff"
+
+ # Fix for bug #270551
+ eapply "${FILESDIR}/${PN}-3.22-glibc-2.10.patch"
+
+ # Fix security bugs #522114 and #638108
+ eapply "${FILESDIR}/${PN}-CVE-2014-3618-16844.patch"
+
+ eapply_user
+}
+
+src_compile() {
+ # -finline-functions (implied by -O3) leaves strstr() in an infinite
loop.
+ # To work around this, we append -fno-inline-functions to CFLAGS
+ # Since GCC 4.7 we also need -fno-ipa-cp-clone (bug #466552)
+ # If it's clang, ignore -fno-ipa-cp-clone, as clang doesn't support this
+ case "$(tc-getCC)" in
+ "clang") append-flags -fno-inline-functions ;;
+
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail-lib/, mail-filter/pypolicyd-spf/, ...
commit: 73c98d1571fc95177961b2b28a7ea2d66db0da23 Author: Michał Górny gentoo org> AuthorDate: Sun Dec 10 09:46:20 2017 + Commit: Michał Górny gentoo org> CommitDate: Sun Dec 10 10:09:54 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73c98d15 mail-filter/*: Update Manifest hashes mail-filter/MailScanner/Manifest | 2 +- mail-filter/afew/Manifest | 4 ++-- mail-filter/amavisd-milter/Manifest | 4 ++-- mail-filter/amavisd-new/Manifest | 10 +- mail-filter/anomy-sanitizer/Manifest | 6 +++--- mail-filter/anubis/Manifest | 4 ++-- mail-filter/ask/Manifest | 4 ++-- mail-filter/assp/Manifest | 10 +- mail-filter/bmf/Manifest | 2 +- mail-filter/bogofilter/Manifest | 2 +- mail-filter/clamassassin/Manifest | 2 +- mail-filter/clamsmtp/Manifest | 2 +- mail-filter/couriersrs/Manifest | 2 +- mail-filter/dcc/Manifest | 6 +++--- mail-filter/disspam/Manifest | 2 +- mail-filter/dkimproxy/Manifest| 2 +- mail-filter/dovecot-antispam/Manifest | 2 +- mail-filter/dovecot_deleted_to_trash/Manifest | 2 +- mail-filter/dspam/Manifest| 2 +- mail-filter/exim-geoip/Manifest | 2 +- mail-filter/exim-p0f/Manifest | 2 +- mail-filter/gld/Manifest | 2 +- mail-filter/imapfilter/Manifest | 6 +++--- mail-filter/libdkim/Manifest | 2 +- mail-filter/libmilter/Manifest| 2 +- mail-filter/libsieve/Manifest | 2 +- mail-filter/libspf2/Manifest | 4 ++-- mail-filter/libsrs2/Manifest | 2 +- mail-filter/libsrs_alt/Manifest | 2 +- mail-filter/maildrop/Manifest | 6 +++--- mail-filter/mailfilter/Manifest | 4 ++-- mail-filter/mapson/Manifest | 2 +- mail-filter/milter-regex/Manifest | 2 +- mail-filter/mimedefang/Manifest | 6 +++--- mail-filter/normalizemime/Manifest| 2 +- mail-filter/opendkim/Manifest | 2 +- mail-filter/opendmarc/Manifest| 8 mail-filter/opensmtpd-extras/Manifest | 4 ++-- mail-filter/p3scan/Manifest | 4 ++-- mail-filter/policyd-weight/Manifest | 2 +- mail-filter/policyd/Manifest | 2 +- mail-filter/popfile/Manifest | 2 +- mail-filter/postfwd/Manifest | 2 +- mail-filter/postgrey/Manifest | 8 mail-filter/postsrsd/Manifest | 2 +- mail-filter/procmail-lib/Manifest | 4 ++-- mail-filter/procmail/Manifest | 2 +- mail-filter/pypolicyd-spf/Manifest| 2 +- mail-filter/qmail-scanner/Manifest| 16 mail-filter/razor/Manifest| 2 +- mail-filter/rblcheck/Manifest | 2 +- mail-filter/rmilter/Manifest | 4 ++-- mail-filter/scmail/Manifest | 2 +- mail-filter/sid-milter/Manifest | 2 +- mail-filter/sieve-connect/Manifest| 2 +- mail-filter/sigh/Manifest | 2 +- mail-filter/spamass-milter/Manifest | 2 +- mail-filter/spamassassin-botnet/Manifest | 2 +- mail-filter/spambayes/Manifest| 6 +++--- mail-filter/spamdyke/Manifest | 4 ++-- mail-filter/spampd/Manifest | 4 ++-- mail-filter/spamprobe/Manifest| 2 +- mail-filter/sqlgrey/Manifest | 2 +- mail-filter/tmda/Manifest | 2 +- mail-filter/zdkimfilter/Manifest | 2 +- 65 files changed, 110 insertions(+), 110 deletions(-) diff --git a/mail-filter/MailScanner/Manifest b/mail-filter/MailScanner/Manifest index 75678dd092e..3b48dea3dd1 100644 --- a/mail-filter/MailScanner/Manifest +++ b/mail-filter/MailScanner/Manifest @@ -1 +1 @@ -DIST MailScanner-install-4.84.5-2.tar.gz 9510489 SHA256 3467a53159cc95a8b4f93a326a59e2d3acc0ad6f90f048f048742fe13ac741f1 SHA512 d9d082e29ddb6eae4f30069298507805a7674c264bf8edad3db3322fa0f2c2ad4539c0c2213c6fcbee11b7c57a36218c1d24243077358bac98e7ae07f7ee506f WHIRLPOOL a253706f33dbc3925e49d7bb0740fab39f87c690240c043eb10cf8d57ea938fd1e002fcec9d8f1c026003e07df01b724d2b696a6224a6cf52e8afc0e1d175d59 +DIST MailScanner-install-4.84.5-2.tar.gz 9510489 BLAKE2B 7bfdb0ba9fbd38281328e66fab9512b6dcc596d92fb18186df950d26c451bff0a8fa5345df7849e60e0040e6559754ef9e2099c17425ed4a6465071e0fb610dd SHA512 d9d082e29ddb6eae4f30069298507805a7674c264bf8edad3db3322fa0f2c2ad4539c0c2213c6fcbee11b7c57a36218c1d24243077358bac98e7ae07f7ee506f diff
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: c2934bfb028481f61337525422564b5d3ecb8821
Author: Fabian Groffen gentoo org>
AuthorDate: Mon Oct 2 07:10:42 2017 +
Commit: Fabian Groffen gentoo org>
CommitDate: Mon Oct 2 07:10:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2934bfb
mail-filter/procmail: add warning about FEATURES=sfperms interacting badly with
some MTAs, bug #632102
Package-Manager: Portage-2.3.8, Repoman-2.3.1
mail-filter/procmail/procmail-3.22-r11.ebuild | 8
1 file changed, 8 insertions(+)
diff --git a/mail-filter/procmail/procmail-3.22-r11.ebuild
b/mail-filter/procmail/procmail-3.22-r11.ebuild
index 00884540ec7..c717564afa4 100644
--- a/mail-filter/procmail/procmail-3.22-r11.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r11.ebuild
@@ -109,4 +109,12 @@ pkg_postinst() {
elog "/etc/procmailrc, for example:"
elog "\tDEFAULT=\$HOME/.maildir/"
fi
+ if has sfperms ${FEATURES}; then
+ ewarn "FEATURES=sfperms removes the read-bit for others from"
+ ewarn " /usr/bin/procmail"
+ ewarn " /usr/bin/lockfile"
+ ewarn "If you use procmail from an MTA like Exim, you need to"
+ ewarn "re-add the read-bit or avoid the MTA checking the binary"
+ ewarn "exists."
+ fi
}
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/, mail-filter/procmail/files/
commit: 145b02cb8226fe3257e06614559dfa3a7c24aa01
Author: Fabian Groffen gentoo org>
AuthorDate: Mon Jan 30 19:08:03 2017 +
Commit: Fabian Groffen gentoo org>
CommitDate: Mon Jan 30 19:08:03 2017 +
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..
--- 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
}
[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/
commit: e3fefa967b840fb928c2cf21930bcf50ea62d713
Author: Austin English gentoo org>
AuthorDate: Thu Jun 2 07:07:09 2016 +
Commit: Austin English gentoo org>
CommitDate: Wed Jun 15 03:35:21 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3fefa96
mail-filter/procmail: fix building with clang
Gentoo-Bug: https://bugs.gentoo.org/526842
Also update to EAPI 6
Reviewed-by: Robin H. Johnson gentoo.org>
mail-filter/procmail/procmail-3.22-r11.ebuild | 116 ++
1 file changed, 116 insertions(+)
diff --git a/mail-filter/procmail/procmail-3.22-r11.ebuild
b/mail-filter/procmail/procmail-3.22-r11.ebuild
new file mode 100644
index 000..8d0e7c2
--- /dev/null
+++ b/mail-filter/procmail/procmail-3.22-r11.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs prefix
+
+DESCRIPTION="Mail delivery agent/filter"
+HOMEPAGE="http://www.procmail.org/;
+SRC_URI="http://www.procmail.org/${P}.tar.gz;
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
~x86 ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="mbox selinux"
+
+DEPEND="virtual/mta"
+RDEPEND="selinux? ( sec-policy/selinux-procmail )"
+
+src_prepare() {
+ # disable flock, using both fcntl and flock style locking
+ # doesn't work with NFS with 2.6.17+ kernels, bug #156493
+
+ sed -e "s:/\*#define NO_flock_LOCK:#define NO_flock_LOCK:" \
+ -i config.h || die "sed failed"
+
+ if ! use mbox ; then
+ echo "# Use maildir-style mailbox in user's home directory" >
"${S}"/procmailrc || die
+ echo 'DEFAULT=$HOME/.maildir/' >> "${S}"/procmailrc || die
+ cd "${S}" || die
+ eapply "${FILESDIR}/gentoo-maildir3.diff"
+ else
+ echo '# Use mbox-style mailbox in /var/spool/mail' >
"${S}"/procmailrc || die
+ echo 'DEFAULT=${EPREFIX}/var/spool/mail/$LOGNAME' >>
"${S}"/procmailrc || die
+ fi
+
+ # Do not use lazy bindings on lockfile and procmail
+ if [[ ${CHOST} != *-darwin* && ${CHOST} != *-interix* ]]; then
+ eapply -p0 "${FILESDIR}/${PN}-lazy-bindings.diff"
+ fi
+
+ # Fix for bug #102340
+ eapply -p0 "${FILESDIR}/${PN}-comsat-segfault.diff"
+
+ # Fix for bug #119890
+ eapply -p0 "${FILESDIR}/${PN}-maxprocs-fix.diff"
+
+ # Prefixify config.h
+ eapply -p0 "${FILESDIR}"/${PN}-prefix.patch
+ eprefixify config.h Makefile src/autoconf src/recommend.c
+
+ # Fix for bug #26
+ eapply "${FILESDIR}/${PN}-pipealloc.diff"
+
+ # 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
+}
+
+src_compile() {
+ # -finline-functions (implied by -O3) leaves strstr() in an infinite
loop.
+ # To work around this, we append -fno-inline-functions to CFLAGS
+ # Since GCC 4.7 we also need -fno-ipa-cp-clone (bug #466552)
+ # If it's clang, ignore -fno-ipa-cp-clone, as clang doesn't support this
+ case "$(tc-getCC)" in
+ "clang") append-flags -fno-inline-functions ;;
+ "gcc"|*) append-flags -fno-inline-functions -fno-ipa-cp-clone ;;
+ esac
+
+ sed -e "s:CFLAGS0 = -O:CFLAGS0 = ${CFLAGS}:" \
+ -e "s:LDFLAGS0= -s:LDFLAGS0 = ${LDFLAGS}:" \
+ -e "s:LOCKINGTEST=__defaults__:#LOCKINGTEST=__defaults__:" \
+ -e "s:#LOCKINGTEST=/tmp:LOCKINGTEST=/tmp:" \
+ -i Makefile || die "sed failed"
+
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ cd "${S}"/new || die
+ insinto /usr/bin
+ insopts -m 6755
+ doins procmail
+
+ doins lockfile
+ fowners root:mail /usr/bin/lockfile
+ fperms 2755 /usr/bin/lockfile
+
+ dobin formail mailstat
+ insopts -m 0644
+
+ doman *.1 *.5
+
+ cd "${S}" || die
+ dodoc FAQ FEATURES HISTORY INSTALL KNOWN_BUGS README
+
+ insinto /etc
+ doins procmailrc
+
+ docinto examples
+ dodoc examples/*
+}
+
+pkg_postinst() {
+ if ! use mbox ; then
+ elog "Starting with mail-filter/procmail-3.22-r9 you'll need to
ensure"
+ elog "that you configure a mail storage location using DEFAULT
in"
+ elog "/etc/procmailrc, for example:"
+ elog "\tDEFAULT=\$HOME/.maildir/"
+ fi
+}
