From 0706fc6986773f4e4d391deff4ad5143c464ea4e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 24 Mar 2019 17:44:59 +0000 Subject: Revert "gentoo resync : 24.03.2019" This reverts commit aa3411e241a201d53a2689766fe419f2756819f3. --- mail-filter/procmail/Manifest | 2 - .../files/procmail-CVE-2014-3618-16844.patch | 25 ----- mail-filter/procmail/procmail-3.22-r12.ebuild | 123 --------------------- 3 files changed, 150 deletions(-) delete mode 100644 mail-filter/procmail/files/procmail-CVE-2014-3618-16844.patch delete mode 100644 mail-filter/procmail/procmail-3.22-r12.ebuild (limited to 'mail-filter/procmail') diff --git a/mail-filter/procmail/Manifest b/mail-filter/procmail/Manifest index 1389e51bb80f..969195edc9d3 100644 --- a/mail-filter/procmail/Manifest +++ b/mail-filter/procmail/Manifest @@ -1,6 +1,5 @@ AUX gentoo-maildir3.diff 461 BLAKE2B fe88378c71c00191a2eda8b21b32e554f5c1175ff7acbc628a099f77a79d67ab0aa1a054950133f4b7c342e78ec7a12ccb07f6f944df907087f9109173fbb3be SHA512 3736e55e95cab67be23281b343456aa9d9624d14e23b1f293014abc5e711c715f362e5a8464a8779dc01f1e6fb5560a346d265b334ee87f65bd0664f87bc09be AUX procmail-3.22-glibc-2.10.patch 2840 BLAKE2B d2bbe3a987e07a47bdf8feda7639cb9b1607be870418474d46dfb4add70fbce528429f64ea32b925d42f7674300769f9bc7fac11747ffecc2d20ceefe97a92b3 SHA512 44a5f7c3c6cf1b2f9241eb45e64322abd7b685ecd4909f0b126ababe9f14c9c0e7978daa9f5218d3255359d46760c628085a77ee7e3c61a272830477d21adeb9 -AUX procmail-CVE-2014-3618-16844.patch 806 BLAKE2B 4113d7511a9a578a14dd5290340837931b1f6b148baa5ca22669c615544653472d7e64d0916e0b55ee89dc02f2bcee14a5f243eeecea9adc0a91d6510b0e52d5 SHA512 41bf80a73d35f83d82e5f32f3a915c10e7ec6a2780df4d70230aa086336c06eb3477f97b689794725e0a5aaa755e0437fce8c90fd0131d6e2673956fced34f1c AUX procmail-comsat-segfault.diff 822 BLAKE2B 307b0bdf7ae224f99d289ee6e343f40a3d997ed412b9a1b682f62c01561866de2610d2347584e6f4999f9696bde44dc6448d69518f70b05338f5f6ba69b353ae SHA512 2a306dbce15cf7fe71e3f20a4707a9b326431da20638b29365090ae4a6c444483046d2f8940f5a8db7120708414c3386bea3254aea6b397633f04b6babc6d581 AUX procmail-lazy-bindings.diff 622 BLAKE2B 97ef84c92640506f6b6b004b610e98305782c02e256eccb3979f72b60ecb603e3b4cccd73a8ba44278e3578ead7a023a4c8396361b6b53bd2984d3c7028fc76d SHA512 aea07c42ec87b7b8d04a5f0f514d4d14aedf8e60f116c4106d29c36de7858cb345930778b38385cf03e5b5a4af230947798625ebec54759f506b4b7b9df826f4 AUX procmail-maxprocs-fix.diff 465 BLAKE2B 05df3e8111ec4953a034fbdd93c9342b1581e8ebd2cf13e213750b581ab57ec8795d4b9d2b33b2bca952b853e15ec7aec3b3678b88569b4ab72cdf787c19d600 SHA512 f6dbcca6a42d2e9f82c167287e7220ab0a68bf34e890f48310331f650b30400b65643f4f5d13f8c8e3b95431c3c4d9292ac14607891f064e811a81fdba6fbf9e @@ -9,5 +8,4 @@ AUX procmail-prefix.patch 5748 BLAKE2B c25d1de87d59771f959940d59195096711e70cc2a DIST procmail-3.22.tar.gz 226817 BLAKE2B 4fd4641abcd3a897ea19bd8f76446f88806d22649d5221f8cef6f9efc29f7fcc02c9707cbf00c32fe247f16579d28fd887d3c18c4d3a2f8877c351bf92e85866 SHA512 3d0658329a55957a8d5741e03b0853b030c4524acef30641663213aa9eefc8264f8cc2b68a00a89e5f9f0f7c916c41a42e1b6c8df562c545ba97d8ab9049a936 EBUILD procmail-3.22-r10.ebuild 2974 BLAKE2B 3be993b59382cd089b785b048efeb7eeed3f6c165b8abeee189618d5b3b13d307f9a29de1923c44e33b758e71767aa340bdae3483d512db8ff3917ea1b311aa4 SHA512 cce27ee51e5447af58414314ba955d089bbc637fb7cf53392c1f22a70a72686b8aef385b74155f4e14163f88dc469c4e5d9c76c508a7b39a5eb74cfc1c5ee02f EBUILD procmail-3.22-r11.ebuild 3474 BLAKE2B f2a7a2a648a12e80588f44a321fe084bc2f2decb7034b77a6a2dada6f57e13061d5a942dd00248d74c8c2806250273f7912c7f9040d85554f1903ac9bb67ca16 SHA512 8b664a9979b4180c5b7814b84387f9fb8793ffc71b7b36ab662ec1eacb5d2774a49e80d60a78c782f74ad889736bbbd4fc215cad3aa6e7ab0f10572448873b97 -EBUILD procmail-3.22-r12.ebuild 3566 BLAKE2B b6cf0d79ee7bfc4f4b46023f6fe2ad15b0fbdfa7a265b4e5e3aefb4fb3844d4219ed9fadc2b17c261faa22c3b310b8bfad206b288a10193048d2b0e476363ef4 SHA512 8edd39eab88517ff8445397cc90571ebadaf4f76879c0c661466e3f2a124dfcdcc0f02c3bdc24b3ff410404bbba1c99718c6aa26b3890c04d7794356a53e337b MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db 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 4f1714063c9e..000000000000 --- a/mail-filter/procmail/files/procmail-CVE-2014-3618-16844.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/src/formisc.c 2019-03-23 19:52:18.450174402 -0400 -+++ b/src/formisc.c 2019-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 deleted file mode 100644 index a0a75c0fb30e..000000000000 --- 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 #200006 - 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" - 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 -} -- cgit v1.2.3